@nykopol - this looks good. It'll need a rebase (it contains some duplicated changes from #3407) - but keep going! :)

@weaverryan yes it's my mistake i did not start in an other branch. When you say a 'rebase' you think a new PR ?

Hey @nykopol!

No problem :). You can actually rebase your overridden_options branch and then force push right back to it. Assuming upstream is the remote name for symfony/symfony-docs and origin is to your fork, something like:

git checkout overridden_options
git fetch upstream
git rebase upstream/master
git push origin overridden_options --force

As soon as you push to the overridden_options branch on your fork, those commits will show up here. You'll need to fix some conflicts after running rebase.

Cheers!

Thanks @weaverryan for you help. I don't had conflict on rebase but on push. I hope it's ok now.

Sorry @nykopol it's still conflicting.

Hey @nykopol!

Yea, it's still conflicting unfortunately :). Did you fetch from the "symfony/symfony-docs" repository and rebase against its master?

Let me know! Thanks!

Hi guys!

I've rebased and re-opened this PR at #3506 for review. I'll close this :).

Thanks!